From abe56727d46e5afdf88df58326c5d40a28204dc6 Mon Sep 17 00:00:00 2001 From: Ivan Ukhov Date: Sun, 5 Apr 2015 09:00:01 +0200 Subject: [PATCH] Derive Clone when deriving Copy --- Cargo.lock | 4 ++-- src/cargo/core/registry.rs | 2 +- src/cargo/core/resolver/mod.rs | 2 +- src/cargo/core/shell.rs | 2 +- src/cargo/ops/cargo_compile.rs | 2 +- src/cargo/ops/cargo_new.rs | 2 +- src/cargo/ops/cargo_rustc/context.rs | 2 +- src/cargo/ops/cargo_rustc/engine.rs | 2 +- src/cargo/ops/cargo_rustc/mod.rs | 2 +- src/cargo/util/dependency_queue.rs | 2 +- src/registry/lib.rs | 2 +- src/rustversion.txt | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8d6ec6ed..e0ae1f18d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,7 +21,7 @@ dependencies = [ "semver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -279,7 +279,7 @@ dependencies = [ [[package]] name = "term" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index f887eb1dd..d6d4e8984 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -60,7 +60,7 @@ pub struct PackageRegistry<'a, 'b: 'a> { locked: HashMap)>>>, } -#[derive(PartialEq, Eq, Copy)] +#[derive(PartialEq, Eq, Clone, Copy)] enum Kind { Override, Locked, diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index a33614dc1..d3b58c8fb 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -29,7 +29,7 @@ pub struct Resolve { metadata: Option, } -#[derive(Copy)] +#[derive(Clone, Copy)] pub enum Method<'a> { Everything, Required{ dev_deps: bool, diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs index ad28ae63d..605b9a175 100644 --- a/src/cargo/core/shell.rs +++ b/src/cargo/core/shell.rs @@ -8,7 +8,7 @@ use term::{Terminal, TerminfoTerminal, color}; use self::AdequateTerminal::{NoColor, Colored}; -#[derive(Copy)] +#[derive(Clone, Copy)] pub struct ShellConfig { pub color: bool, pub verbose: bool, diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index 12b1e0d8d..0ef49cdde 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -60,7 +60,7 @@ pub struct CompileOptions<'a, 'b: 'a> { pub mode: CompileMode, } -#[derive(Copy, PartialEq)] +#[derive(Clone, Copy, PartialEq)] pub enum CompileMode { Test, Build, diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs index 7eedd117e..024721353 100644 --- a/src/cargo/ops/cargo_new.rs +++ b/src/cargo/ops/cargo_new.rs @@ -11,7 +11,7 @@ use git2::Config as GitConfig; use util::{GitRepo, HgRepo, CargoResult, human, ChainError, internal}; use util::Config; -#[derive(Copy, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, PartialEq)] pub enum VersionControl { Git, Hg, NoVcs } pub struct NewOptions<'a> { diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs index b5d0d9170..80f023bdf 100644 --- a/src/cargo/ops/cargo_rustc/context.rs +++ b/src/cargo/ops/cargo_rustc/context.rs @@ -18,7 +18,7 @@ use super::layout::{Layout, LayoutProxy}; use super::{Kind, Compilation, BuildConfig}; use super::{ProcessEngine, ExecEngine}; -#[derive(Debug, Copy)] +#[derive(Debug, Clone, Copy)] pub enum Platform { Target, Plugin, diff --git a/src/cargo/ops/cargo_rustc/engine.rs b/src/cargo/ops/cargo_rustc/engine.rs index b9c1ca1f1..75c467217 100644 --- a/src/cargo/ops/cargo_rustc/engine.rs +++ b/src/cargo/ops/cargo_rustc/engine.rs @@ -13,7 +13,7 @@ pub trait ExecEngine: Send + Sync { } /// Default implementation of `ExecEngine`. -#[derive(Copy)] +#[derive(Clone, Copy)] pub struct ProcessEngine; impl ExecEngine for ProcessEngine { diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 46cef33b9..19e42294d 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -31,7 +31,7 @@ mod job_queue; mod layout; mod links; -#[derive(PartialEq, Eq, Hash, Debug, Copy)] +#[derive(PartialEq, Eq, Hash, Debug, Clone, Copy)] pub enum Kind { Host, Target } #[derive(Default, Clone)] diff --git a/src/cargo/util/dependency_queue.rs b/src/cargo/util/dependency_queue.rs index 6d5553a6e..f66e503d3 100644 --- a/src/cargo/util/dependency_queue.rs +++ b/src/cargo/util/dependency_queue.rs @@ -39,7 +39,7 @@ pub struct DependencyQueue { /// /// A fresh package does not necessarily need to be rebuilt (unless a dependency /// was also rebuilt), and a dirty package must always be rebuilt. -#[derive(PartialEq, Eq, Debug, Copy)] +#[derive(PartialEq, Eq, Debug, Clone, Copy)] pub enum Freshness { Fresh, Dirty, diff --git a/src/registry/lib.rs b/src/registry/lib.rs index e8f4d51ab..c7ba6f029 100644 --- a/src/registry/lib.rs +++ b/src/registry/lib.rs @@ -22,7 +22,7 @@ pub struct Registry { pub type Result = result::Result; -#[derive(PartialEq, Copy)] +#[derive(PartialEq, Clone, Copy)] pub enum Auth { Authorized, Unauthorized diff --git a/src/rustversion.txt b/src/rustversion.txt index 22e8ceff8..3447d643e 100644 --- a/src/rustversion.txt +++ b/src/rustversion.txt @@ -1 +1 @@ -2015-04-02 +2015-04-04 -- 2.30.2